The History of Rock Music:

Given the size (800 pages total), it is now split in two volumes, about 400 pages each. If you own the old edition, the first volume contains the first four parts (1950s to 1980s), updated and corrected (about 300 small corrections and about 40 small additions). The second volume covers the 1990s